From 81376a6e58b9331f3ca83faea270bfcb30f045eb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 4 Jul 2008 20:01:50 +0000 Subject: [PATCH] Debork svn path=/trunk/; revision=20765 --- ChangeLog | 4 ++++ gtk/gtkmenu.c | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30ae06ae63..d4f8ca0447 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-07-04 Matthias Clasen \ + + * gtk/gtkmenu.c: Debork the attach-widget property. + 2008-07-04 Michael Natterer Fix make check: diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 9d96c75ba2..9687c3ab13 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -536,16 +536,18 @@ gtk_menu_class_init (GtkMenuClass *class) /** * GtkMenu:attach-widget: * - * The widget the menu is attached to. + * The widget the menu is attached to. Setting this property attaches + * the menu without a #GtkMenuDetachFunc. If you need to use a detacher, + * use gtk_menu_attach_to_widget() directly. * * Since: 2.14 **/ g_object_class_install_property (gobject_class, - PROP_ACCEL_PATH, - g_param_spec_string ("attach-widget", + PROP_ATTACH_WIDGET, + g_param_spec_object ("attach-widget", P_("Attach Widget"), P_("The widget the menu is attached to"), - NULL, + GTK_TYPE_WIDGET, GTK_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -792,7 +794,7 @@ gtk_menu_set_property (GObject *object, gtk_menu_set_accel_path (menu, g_value_get_string (value)); break; case PROP_ATTACH_WIDGET: - gtk_menu_attach (menu, g_value_get_object (value), 0, 0, 0, 0); + gtk_menu_attach_to_widget (menu, g_value_get_object (value), NULL); break; case PROP_TEAROFF_STATE: gtk_menu_set_tearoff_state (menu, g_value_get_boolean (value)); -- 2.30.2